Auto merge of #1161 - alexcrichton:issue-1159, r=huonw
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 21:09:13 +0000 (21:09 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 21:09:13 +0000 (21:09 +0000)
Looks like these got tweaked from the compiler...

Closes #1159


Trivial merge